From 6a5c3cfbb62e9288701e455648b262cea48c4cf1 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Tue, 28 Jul 2026 20:20:06 +0000 Subject: [PATCH] Spelling --- doc/src/analyzed/repro_states.m4 | 4 ++-- doc/src/analyzed/swelling_states.m4 | 2 +- doc/src/appendices/technologies.m4 | 2 +- doc/src/architecture/logins.m4 | 5 ++-- doc/src/architecture/permissions.m4 | 5 ++-- doc/src/code_tables.m4 | 24 +++++++++---------- doc/src/epilog.inc.m4 | 8 +++---- doc/src/housekeeping/food_variations.m4 | 2 +- doc/src/housekeeping/pantgrunt_event_log.m4 | 2 +- .../housekeeping/tlk_brecord_notes_codes.m4 | 4 ++-- doc/src/tables/arrivals.m4 | 6 ++--- doc/src/tables/arrivals_a.m4 | 2 +- doc/src/tables/events.m4 | 4 ++-- doc/src/tables/humans.m4 | 4 ++-- doc/src/tables/pantgrunts.m4 | 4 ++-- doc/src/views.m4 | 2 +- doc/src/views/biography.m4 | 2 +- doc/src/views/brec_notes_view.m4 | 2 +- doc/src/views/obs.m4 | 2 +- 19 files changed, 44 insertions(+), 42 deletions(-) diff --git a/doc/src/analyzed/repro_states.m4 b/doc/src/analyzed/repro_states.m4 index 44b4a7b..95822a7 100644 --- a/doc/src/analyzed/repro_states.m4 +++ b/doc/src/analyzed/repro_states.m4 @@ -28,7 +28,7 @@ REPRO_STATES REPRO_STATES contains one row for each female chimpanzee for every day the individual's reproductive state was analyzed. - It tracks whether the female was cycling, pregnant, or lacting + It tracks whether the female was cycling, pregnant, or lactating and where each female is within her reproductive cycle. |REPRO_STATES_summary| @@ -130,7 +130,7 @@ allowed in this column, nor does the system check that the individual is cycling on the given day. This column may be |null| when there is no analysis of number of days -before full detumensence or when the date is such that a number lacks +before full detumescence or when the date is such that a number lacks meaning. diff --git a/doc/src/analyzed/swelling_states.m4 b/doc/src/analyzed/swelling_states.m4 index bcc64ce..a1a4214 100644 --- a/doc/src/analyzed/swelling_states.m4 +++ b/doc/src/analyzed/swelling_states.m4 @@ -41,7 +41,7 @@ The table's rows are computed from the SokweDB tables' content. The |SWELLING_SOURCES| table is used to both force specific sexual swelling values and to add additional records of sexual swelling measurements , records from "external" data sources, into -SWELLING_STATES' minimum and maxium sexual swelling calculations. +SWELLING_STATES' minimum and maximum sexual swelling calculations. There is no way to remove rows from SWELLING_STATES when SokweDB tables, other than the |SWELLING_SOURCES| table, contain sexual swelling information on an individual on a particular day. diff --git a/doc/src/appendices/technologies.m4 b/doc/src/appendices/technologies.m4 index a45b46b..d0510a4 100644 --- a/doc/src/appendices/technologies.m4 +++ b/doc/src/appendices/technologies.m4 @@ -68,7 +68,7 @@ Development Tools Documentation Tools ``````````````````` -* The `ReStructured Text`_ (RST) markup lanugage +* The `ReStructured Text`_ (RST) markup language * The Sphinx_ RST processor * The Inkscape SVG vector graphics editor diff --git a/doc/src/architecture/logins.m4 b/doc/src/architecture/logins.m4 index 954c86a..c1911dd 100644 --- a/doc/src/architecture/logins.m4 +++ b/doc/src/architecture/logins.m4 @@ -1,4 +1,5 @@ -.. Copyright (C) 2019, 2023, 2025 The Meme Factory, Inc. www.karlpinc.com +.. Copyright (C) 2019, 2023, 2025, 2026 The Meme Factory, Inc. + www.karlpinc.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -131,7 +132,7 @@ PostgreSQL superuser. a PostgreSQL_ role that can login and create groups.) If you do not use a role that always exists, then when the creating role is dropped the created role will lose part of its administrative -privilege and will no longer be able to use the PRIMEDB tools to +privilege and will no longer be able to use the SokweDB tools to create users. Hint: Use Unix privilege escalation techniques to execute the SokweDB diff --git a/doc/src/architecture/permissions.m4 b/doc/src/architecture/permissions.m4 index a300f1d..c2c78a4 100644 --- a/doc/src/architecture/permissions.m4 +++ b/doc/src/architecture/permissions.m4 @@ -1,4 +1,5 @@ -.. Copyright (C) 2019, 2023, 2025 The Meme Factory, Inc. www.karlpinc.com +.. Copyright (C) 2019, 2023, 2025, 2026 The Meme Factory, Inc. + www.karlpinc.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -47,7 +48,7 @@ Ordinary permissions are database :dfn:`roles`. Changing A User's Permissions ````````````````````````````` Normally, users are given the desired level of access when their login -is created using SOKWEDB administration tools. +is created using SokweDB administration tools. There are various ways permissions can be granted or changed. One way is with SQL\ [#f2]_, e.g.:: diff --git a/doc/src/code_tables.m4 b/doc/src/code_tables.m4 index 4a9abcc..cf05a4a 100644 --- a/doc/src/code_tables.m4 +++ b/doc/src/code_tables.m4 @@ -1,4 +1,4 @@ -.. Copyright (C) 2023, 2024 The Meme Factory, Inc. www.karlpinc.com +.. Copyright (C) 2023-2026, The Meme Factory, Inc. www.karlpinc.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -133,7 +133,7 @@ CERTAINTIES ----------- .. |CERTAINTIES_summary| replace:: - Contains one row for for each code designating the certainity of + Contains one row for for each code designating the certainty of an event. |CERTAINTIES_summary| @@ -332,7 +332,7 @@ CYCLE_STATES ------------ .. |CYCLE_STATES_summary| replace:: - Contains one row for each degree-of-swelling catagory used to + Contains one row for each degree-of-swelling category used to classify female's sexual swelling measurements, and an additional row for individuals that have no sexual swelling measurement. @@ -381,7 +381,7 @@ Code '''' .. |CYCLE_STATES.Code_summary| replace:: - The code that designates a sexual swelling mesure. + The code that designates a sexual swelling measure. |CYCLE_STATES.Code_summary| |caseuniquekeycol| @@ -409,7 +409,7 @@ The value of this column should only be |null| when the makes no sense, such as ``sdb_missing_swelling`` or ``sdb_male_swelling``. -.. NULL is allowed so that if such a code is inadvertantly included +.. NULL is allowed so that if such a code is inadvertently included .. in a computation the result will be NULL, alerting the user to .. the problem. @@ -428,11 +428,11 @@ Description .. _DAD_STATUSES: DAD_STATUSES (Dad ID Statuses) --------------------------------- +------------------------------ .. |DAD_STATUSES_summary| replace:: Contains one row for each status a |BIOGRAPHY_DATA|.\ - |BIOGRAPHY_DATA.DadID| might have, indicating the certainity or or + |BIOGRAPHY_DATA.DadID| might have, indicating the certainty or or nature of the paternity assignment. |DAD_STATUSES_summary| @@ -903,8 +903,8 @@ Description .. _OBS_PERIODS: -OBS_PERIODS (Obsevervation Periods) ------------------------------------- +OBS_PERIODS (Observation Periods) +--------------------------------- .. |OBS_PERIODS_summary| replace:: Contains one row for each part of the day during which an observer @@ -1162,7 +1162,7 @@ ROLE_CODES .. |ROLE_CODES_summary| replace:: Contains one row for each code designating a generic role that an - invididual may have in an event. + individual may have in an event. |ROLE_CODES_summary| @@ -1173,7 +1173,7 @@ Special Values The ``sdb_actor`` and ``sdb_actee`` codes The codes ``sdb_actor`` and ``sdb_actee`` have special meanings. - They are used to describe asymetric dyadic interaction behavior, + They are used to describe asymmetric dyadic interaction behavior, where event participants are required to be paired. When there is such a dyadic interaction and one participant is assigned one of these roles, the other participant must be assigned @@ -1202,7 +1202,7 @@ The ``sdb_unkpair`` code It is used to describe dyadic interaction behavior where event participants are required to be paired, but the direction of the - dyadic interation is either unknown or the interaction itself has + dyadic interaction is either unknown or the interaction itself has no intrinsic direction -- when the ``sdb_mutual`` code is not appropriate. When there is such a dyadic interaction and one participant is diff --git a/doc/src/epilog.inc.m4 b/doc/src/epilog.inc.m4 index 3d1d67f..4dc776f 100644 --- a/doc/src/epilog.inc.m4 +++ b/doc/src/epilog.inc.m4 @@ -483,7 +483,7 @@ elo_ranks_daily_rst(sdb_male, MT)dnl .. |FERTILITY.StartType| replace:: :ref:`StartType ` .. |FERTILITY.StopDate| replace:: - :ref:`Stopdate ` + :ref:`StopDate ` .. |FERTILITY.StopType| replace:: :ref:`StopType ` @@ -507,7 +507,7 @@ elo_ranks_daily_rst(sdb_male, MT)dnl .. |FOLLOW_OBSERVERS.OBS_Tiki| replace:: :ref:`OBS_Tiki ` -.. |FOLLOW_STUIDES| replace:: :ref:`FOLLOW_STUDIES ` +.. |FOLLOW_STUDIES| replace:: :ref:`FOLLOW_STUDIES ` .. |FOLLOW_STUDIES.FSID| replace:: :ref:`FSID ` .. |FOLLOW_STUDIES.WID| replace:: @@ -819,7 +819,7 @@ elo_ranks_daily_rst(sdb_male, MT)dnl .. |SIV_STATUS_BOUT.LastTestDate| replace:: :ref:`LastTestDate ` .. |SIV_STATUS_BOUT.BoutNumber| replace:: - :ref:`BoutNumer ` + :ref:`BoutNumber ` .. |SIV_STATUS_BOUT.NamesUsed| replace:: :ref:`NamesUsed ` .. |SIV_STATUS_BOUT.InBioTable| replace:: @@ -947,7 +947,7 @@ elo_ranks_daily_rst(sdb_male, MT)dnl .. |unique| replace:: Each value stored in this column must be unique. -.. The sdb_case_equalivance() macro is used in indexes for uniquenocase. +.. The sdb_case_equivalence() macro is used in indexes for uniquenocase. .. |uniquenocase| replace:: Each value stored in this column must be unique, independent of character case. diff --git a/doc/src/housekeeping/food_variations.m4 b/doc/src/housekeeping/food_variations.m4 index e948d0b..0590030 100644 --- a/doc/src/housekeeping/food_variations.m4 +++ b/doc/src/housekeeping/food_variations.m4 @@ -65,7 +65,7 @@ LocalName ````````` .. |FOOD_VARIATIONS.LocalName_summary| replace:: - The name of the food in the local venacular. + The name of the food in the local vernacular. |FOOD_VARIATIONS.LocalName_summary| diff --git a/doc/src/housekeeping/pantgrunt_event_log.m4 b/doc/src/housekeeping/pantgrunt_event_log.m4 index c6623f1..4e19e3d 100644 --- a/doc/src/housekeeping/pantgrunt_event_log.m4 +++ b/doc/src/housekeeping/pantgrunt_event_log.m4 @@ -36,7 +36,7 @@ The following text strings carry some meaning: ``F-F`` female-to-female pantgrunts extracted ``F-M`` - female-to-male pantrgrunts extracted + female-to-male pantgrunts extracted ``M-M`` male-to-male pantgrunts extracted ``NA`` diff --git a/doc/src/housekeeping/tlk_brecord_notes_codes.m4 b/doc/src/housekeeping/tlk_brecord_notes_codes.m4 index 879ba3f..b19f209 100644 --- a/doc/src/housekeeping/tlk_brecord_notes_codes.m4 +++ b/doc/src/housekeeping/tlk_brecord_notes_codes.m4 @@ -51,7 +51,7 @@ Abbreviation ```````````` .. |TLK_BRECORD_NOTES_CODES.Abbreviation_summary| replace:: - An abbrevation used in B-Record note taking. + An abbreviation used in B-Record note taking. |TLK_BRECORD_NOTES_CODES.Abbreviation_summary| @@ -68,7 +68,7 @@ Meaning ``````` .. |TLK_BRECORD_NOTES_CODES.Meaning_summary| replace:: - A description of the abbrevation. + A description of the abbreviation. |TLK_BRECORD_NOTES_CODES.Meaning_summary| diff --git a/doc/src/tables/arrivals.m4 b/doc/src/tables/arrivals.m4 index ffe739b..d73e603 100644 --- a/doc/src/tables/arrivals.m4 +++ b/doc/src/tables/arrivals.m4 @@ -116,7 +116,7 @@ NestStart (in Nest at the Start time) ````````````````````````````````````` .. |ARRIVALS.NestStart_summary| replace:: - A |boolean|, whether or not the related participent, related + A |boolean|, whether or not the related participant, related through |EVENTS| and |ROLES|, was in a nest at the time of arrival. |ARRIVALS.NestStart_summary| |notnull| @@ -128,7 +128,7 @@ NestStart (in Nest at the Stop time) ```````````````````````````````````` .. |ARRIVALS.NestEnd_summary| replace:: - A |boolean|, whether or not the related participent, related + A |boolean|, whether or not the related participant, related through |EVENTS| and |ROLES|, was in a nest at the time of departure. |ARRIVALS.NestEnd_summary| |notnull| @@ -145,7 +145,7 @@ Cycle (Cycle state) |ARRIVALS.Cycle_summary| -All indivdiuals, female or not, have a value in this column, to avoid +All individuals, female or not, have a value in this column, to avoid |tri-valued logic| and therefore simplify querying. The value used for males and other non-cycling individuals is un-interesting. diff --git a/doc/src/tables/arrivals_a.m4 b/doc/src/tables/arrivals_a.m4 index 0df5a3f..cc77bdf 100644 --- a/doc/src/tables/arrivals_a.m4 +++ b/doc/src/tables/arrivals_a.m4 @@ -31,7 +31,7 @@ ARRIVALS_A |ARRIVALS_A_summary| The system generates a warning when the sexual swelling information -associated with an individual volates what is expected: +associated with an individual violates what is expected: Females should not be assigned the swelling code reserved for males (and individuals of unknown sex). diff --git a/doc/src/tables/events.m4 b/doc/src/tables/events.m4 index 0d5079e..f97f41a 100644 --- a/doc/src/tables/events.m4 +++ b/doc/src/tables/events.m4 @@ -173,7 +173,7 @@ The following table lists these rules and implications: This means the value of the EVENTS.\ |EVENTS.Start| column must equal the value of the EVENTS.\ |EVENTS.Stop| column. - Aggressions are allowed to have no record of the time they occured, + Aggressions are allowed to have no record of the time they occurred, in which case the special value of ``sdb_no_time`` is used. See below for more detail. @@ -876,5 +876,5 @@ Notes For further information on what is required to work with |null| values, see the PostgreSQL_ documentation's section on `tri-valued - logic`_, and the exensive discussion of the implications of the + logic`_, and the extensive discussion of the implications of the |null| value in the `comparison functions`_ section. diff --git a/doc/src/tables/humans.m4 b/doc/src/tables/humans.m4 index fa3da21..1fb6ea8 100644 --- a/doc/src/tables/humans.m4 +++ b/doc/src/tables/humans.m4 @@ -64,13 +64,13 @@ Researchers |nonnegative| |notnull| -.. _HUMANS.Nonresearchers: +.. _HUMANS.NonResearchers: NonResearchers `````````````` .. |HUMANS.NonResearchers_summary| replace:: - The number of additional nonresearchers present during the event. + The number of additional non-researchers present during the event. |HUMANS.NonResearchers_summary| |nonnegative| |notnull| diff --git a/doc/src/tables/pantgrunts.m4 b/doc/src/tables/pantgrunts.m4 index 2c5ec8f..8360f42 100644 --- a/doc/src/tables/pantgrunts.m4 +++ b/doc/src/tables/pantgrunts.m4 @@ -46,7 +46,7 @@ There should be one row for each dyad. event recorded in the given follow at the given time.\ [#f1]_ It may be more convenient to use the |PANTGRUNTS_VIEW| view, than to -use the PANTGRUTS table. +use the PANTGRUNTS table. The related |EVENTS| row must be a pantgrunt event; it must have an |EVENTS|.\ |EVENTS.Behavior| value of ``sdb_pg_event``. @@ -167,7 +167,7 @@ Source |notnull| -.. _PANTGRUNTS.Enteredby: +.. _PANTGRUNTS.EnteredBy: EnteredBy ````````` diff --git a/doc/src/views.m4 b/doc/src/views.m4 index 97bb1a7..a73226e 100644 --- a/doc/src/views.m4 +++ b/doc/src/views.m4 @@ -213,7 +213,7 @@ Others reproduce common query patterns, eliminating the need to connect | View | One row for each | Purpose | Tables/Views used | +===================+======================+==========================+======================+ | |DYADS| | |EVENTS| row, where | Simplifies querying -- | |WATCHES|, |EVENTS|, | -| | the behavior | puts the two individals | |ROLES| (twice) | +| | the behavior | puts the two individuals | |ROLES| (twice) | | | observed is a dyadic | involved in a dyadic | | | | interaction | interactions into a | | | | | single row. | | diff --git a/doc/src/views/biography.m4 b/doc/src/views/biography.m4 index 4766335..a72c681 100644 --- a/doc/src/views/biography.m4 +++ b/doc/src/views/biography.m4 @@ -144,5 +144,5 @@ None. Other data types, like date-and-time-together ``TIMESTAMP`` data type, do not have this feature. In those cases the |function_julian| function, which returns a - "date" that is counted in units of days, is a convient way to + "date" that is counted in units of days, is a convenient way to replicate this kind of computation. diff --git a/doc/src/views/brec_notes_view.m4 b/doc/src/views/brec_notes_view.m4 index 5fd88cb..b9c323a 100644 --- a/doc/src/views/brec_notes_view.m4 +++ b/doc/src/views/brec_notes_view.m4 @@ -87,7 +87,7 @@ follow as the grooming was recorded, while the grooming was ongoing. , brec_notes_view.time, brec_notes_view.eid; There is, at the time of this writing, no view incorporating -|GROOMINGS|, to make it eaiser to query. +|GROOMINGS|, to make it easier to query. So the above query explicitly uses |DYADS| and |GROOMINGS|. And, here is a query showing some |BRECORD_NOTES| information alongside diff --git a/doc/src/views/obs.m4 b/doc/src/views/obs.m4 index 93402af..bde782e 100644 --- a/doc/src/views/obs.m4 +++ b/doc/src/views/obs.m4 @@ -83,7 +83,7 @@ involving dyadic interactions. (Events not involving pairs of individuals.) Queries similar to the following may report on events such as feeding bouts, location observations, other species present, colobus -enconters, etc. +encounters, etc. From the example, substitute the appropriate table, |FOOD_EVENTS|, |LOCATIONS_UTM|, |SPECIES_PRESENT|, |COLOBUS|, etc., and that table's columns, in place of the |ARRIVALS_A| table and its columns. -- 2.34.1